Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 12 Jun 2011 03:54:09 +0000 (20:54 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 12 Jun 2011 03:54:09 +0000 (20:54 -0700)
commit4933b7e914c4bfbeb769b03b7842663dd745601c
treea7ea34db322fbdac57e2b8bd5360a7a29c5d2434
parent08cf39b9f72f83cb12a9dca0dd8002c31916bf28
parent80b3dea06f9bcbb69cbec10430663abb774cbb29
Merge from trunk.
src/ChangeLog